Snap for 6740034 from 7c9f8742dcece090753d05f5c51b98be0eb00fbe to rvc-qpr1-release

Change-Id: I2d1956b08ce0289ce0b65d848cafbf47dd645f9a