Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 81a32027 am: 82abc4fb am: 95fa80c2 Change-Id: I52516e961d579759080c27399fa65cfaceea3784