Merge changes I0d79642d,If8756ac8,I29e73897,Ia8c5121a,I533b8f06 into rvc-dev am: 9bad85af am: 3bd1a83e Change-Id: I5c194c4b27732f02e938591ebdcb6e6f6a9b3c1a