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

Change-Id: I32057d13c56acb53cd275d7d1cda4554f4b5fa7b