Snap for 5978242 from 939d6f2db7ef7dd2a64ccd424a6d82549110f3cb to rvc-release

Change-Id: I9f09c1245012af8890d32eeaca7246bfeb0fb17f