Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 6a8d59d964 am: 2822c4da25 am: 2cea8c8086 am: e7f2b68979

Change-Id: I79887782c120daf72e6c3343bc4688c1bb2d38cb