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

Change-Id: I500e3a388dce65128637a090669cc5189f7ee103