Snap for 6660508 from c8b94bf31972d57903d06b93337d48e673f7290f to rvc-release

Change-Id: I7cb3c34ba7340d8e37632c613ece6e70dfcdb65c