Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 6a8d59d964 am: 13421dff38 am: 3aae77847b

Change-Id: Ibfa6f373bb0e128afad84beb26f684030bd082da