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