Merge changes I51e949fa,Ic5202caf,I1111fa15,I11ffa080,I8d2f5f59 into rvc-dev am: 76dd667310 am: f1995e0261 am: 8149f5d9e5 am: fff4386bc7 am: 88b8b0a902

Change-Id: I4d29ab79dee47832e6ff1204d7b53c336480f6e4