Snap for 6683785 from d2f1b904b21727ebdaf308c2d366464a2470fea9 to rvc-d1-release

Change-Id: I2e2566ed551146572a903c3c1e00b31677cf3e08