Snap for 6496549 from 56b4759cdba26fc32b2a1cebde6e55fda3db2a68 to rvc-release

Change-Id: I84704d7e7f3f2ba8817cd1205d9c8165d2768fdd