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
Change-Id: Id1905edd4fafd86219d091091270e5385cadb673