Snap for 6582636 from 8020bf2f4bb00897cdea7c5585b9c75632aae224 to rvc-release

Change-Id: If03bc0890d383ba2cfa26fa009473334dd3788f3