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

Change-Id: Ie8dc0dd8880eed971d4d5fa9dec5d32adf8a7906