Snap for 6164373 from 134a55a96f6e60d06efe5083de7e8232085e4133 to rvc-release

Change-Id: I7c449f796bedf138993c896ca9590f8d99ea7075