Snap for 5556694 from 1579f3e6bbb534b4e9a5ff68d21111838060f95a to rvc-release

Change-Id: I8867d1626c05cc8d43e3fc57e28554ac736e6ce5