Snap for 6749551 from 16c42eb38a2e4c080f3fe25978a8d4ba7a8da378 to rvc-d1-release

Change-Id: Icb5e4473d0d63482d0f53b78c167862efd4e7aee