Merge changes I1169beb3,If7c7b737 into rvc-dev am: 0fd43f11 am: 2594622b am: ef9928e0 am: f4c13366 Change-Id: I5f7d7b44b87a0835d54e9d6ceaff4b24ec416ef3