Snap for 6691629 from 851960cdd11c00110377bd81c63824ddd52b7ad4 to rvc-release

Change-Id: Ibb40bf07606bef7a9e08ff28e8f17681aab0802d