Snap for 6188853 from b47bcd97279db87270593c2396ef9717abbd249d to rvc-d1-release Change-Id: I7a4f06b4f04123a287c4f9b1b5557f79222223fc