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: 85787007 am: d69e05a5 am: 64f39eee
Change-Id: I58dd46bc0fc123538d2d18f26d3202ec81287e47