Merge changes I1169beb3,If7c7b737 into rvc-dev am: 0fd43f11e8 am: 2594622b69

Change-Id: I495a9c8ebf2b9982d787c1480ff8bf4349e0ea12