Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 81a320279e

Change-Id: I63d105659a7578774a9594609117939802b33a2d