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

Change-Id: I3d7ee23e69adc9f3fb7f72000dea1049d04647c1