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

Change-Id: I6426d1bdae6ccd4b7febd01aadba901ce2348399