Snap for 6948038 from f08280a05ce634d4f119da81816fb32baa9f77b9 to rvc-platform-release

Change-Id: I6b90b6f12c9d302b70f143061979c58395db08a1