Merge changes Ia233ca64,I2d0bc216,I94003873 into rvc-dev am: f8d52afa am: 85517540 am: ba7a92dc Change-Id: Iffa6f94cd831d70564c43487643c17a7a744f9e8