Snap for 5999026 from d23fc63744a4a87c5f4248cca06b8cda3bbccc41 to rvc-release

Change-Id: I56c162e1178863f993aeecdceabc97e9fa8bf102