Merge "Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 81a32027 am: ec490f08" into rvc-d1-dev-plus-aosp