Snap for 5984067 from db5365047a3cf7ff73c5ac9fa3d901925e00362c to rvc-release

Change-Id: I8b5af1e3290e148040f120d9ba743017f1e6800b