Snap for 5434517 from 9ac4db444102123328744ceb554c5d6bdf1c72b5 to rvc-release

Change-Id: I768e5aa7f18ac83b1028bfebb49125caa94f83c1