Snap for 7266183 from 90be1b5d2c44dfe03b83cfaaf3b8d9085df838d1 to rvc-d2-release

Change-Id: Id3a088a669dec7a6fb5e6971060712a8388b2e50