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

Change-Id: I17914b491cc3bc4b329fbbf231c9c44d5616a841