Snap for 7129317 from 6b5e33293d695f5290fbb99bfe973d90454f6609 to rvc-d2-release

Change-Id: Ib606aa4fbe1c7550e373a7432dfc9ade4e1cbc16