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

Change-Id: I2d56f6271350ca6a4f9b3be74252e72856a3def2