Snap for 6343882 from 388a6a332fb9f6d7794d7a9bed8eea803a05a13a to rvc-release

Change-Id: Id36d19ed2f3b7273bdbfc248c3e08a80d786b08e