Snap for 6643631 from ef7bf24010d72eaf71580eb594e1e6a2882894e8 to rvc-release

Change-Id: I03d613d159b65d6bf2ebe22c45a43970ec61a550