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

Change-Id: Ia26c78f1dc5490bf305c5581adc31299680cdd45