Snap for 6542793 from d580c3be85917c88adaf474bc70de6e560a6b964 to rvc-d1-release

Change-Id: I7f840a873d429dec17581624aaae16fe65c78bda