Snap for 6643509 from 848b31c2c58f354f436725117eca9a9dd6707425 to rvc-d1-release

Change-Id: Id1fd9a4df33a52b392c93bec63d25d84cac2da96