Snap for 6736502 from 3305262d21fe394c3d56227e02fbfea5c515dd6a to rvc-d1-release

Change-Id: I6674f9cbc3b325c36d47f9b1cf522e14e4336f4d