Merge "Assign original activityType of Task to new undefined activity." into...
Merge "Assign original activityType of Task to new undefined activity." into rvc-dev am: fb9a1917 am: 7fe02e32 am: 50e93d7c
Change-Id: Ib3bc6b23f088fa6da47b1189b290af1f8c4c7b1b