Snap for 6420265 from f4e9913c2741b3b2087367560218a118db85d7e9 to rvc-release

Change-Id: I9793d405717622d422c086a226d93cfb99b67792