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

Change-Id: Ie7909209fb4679627c92f763aff100bd0ebb657f