Merge changes Ic966923a,I92c6dfac,Id370d798 into rvc-dev am: 33cf9d09 am: 8bf13644 am: f391e4b0 Change-Id: I65b46526d1c0c35b0d97e3ac85531fb2b446a267