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

Change-Id: Ia75dad0e7f144fbe0bb77e9506093a45d3c75e5f