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

Change-Id: I9a4ccb6b8c6951e4fbed742d4658b6769257fc6d