Snap for 6374421 from 603ced1acff446300f7cbd4ccf92aee948641991 to rvc-d1-release

Change-Id: Ia198564bbf8220c0be33c0cb4597e436adc4b6f5