Snap for 6739696 from e91dd097ba28fedfa930490b6aff8bf51d68245e to rvc-d1-b-release

Change-Id: Ie12a3adf099ca613c7b7604cf893ce5f0ee5d0c9