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

Change-Id: I2f9cdcd1a2d969b5ff416e0d2db1b1c3a71cac56