Snap for 5870090 from b7ae3fd3b7fe8b7b78c6ba6e1bc7a33f65f57829 to rvc-release

Change-Id: I1b57d973d4b85922df10e9be2bff351a036975ec