Snap for 6484097 from 88147c430cc041a27d07e593ffea12b7aa586f7a to rvc-release

Change-Id: Ib0eeaa206a6ac027533df4601cd91d76233bc319