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

Change-Id: I7d4d3c448291a9398c49aa79deb1d3e393aed84f