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 am: 4be03859
Change-Id: I45719aeeebe93a3f04ae540adf5455ec3325ef90