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

Change-Id: Iaec08e3ca6e85122180c696eb9ca04be1482fcb3