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

Change-Id: Ie59decbdcc4767cb1df97bb91ce6a5a01fdda94d