Merge changes from topic "new-task-snapshots-rvc-dev" into rvc-dev am: 81a32027 am: 82abc4fb am: 95fa80c2 am: 8b0a1a87 Change-Id: I96e2f45eeaa0e05ed35a988289bceb9b0b4ad797