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

Change-Id: I8ce8a4441dcc71e7a08713a3a20fe970aa936233