Snap for 5922838 from d1f40ed47fed2df5021a9ee76b48f933c6b8d8c6 to rvc-release

Change-Id: Iaea167caec417c3c0d1df1abd2aa3bff113e6788