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

Change-Id: I2f81b24bdc129638f7945ebe0b25a61db26bb874