Snap for 5533215 from ba910b3fb28d9de6584f86e6549e314a6c0f6b34 to rvc-release

Change-Id: I437605f72ec8dfed87e522f57a534a0347049cd1