Snap for 6454413 from 6c12a1494a7e503ec5d6803df480a24b28e2a67c to rvc-d1-release

Change-Id: I0e9380a56780cc944ab84ddda615fcdf0a9a6541