Merge changes I51e949fa,Ic5202caf,I1111fa15,I11ffa080,I8d2f5f59 into rvc-dev am: 76dd667310 am: 08d8ab171b

Change-Id: I8bfdc14d161ed4d48046681ed7299e65aa0b5f57