Merge changes I7d2ca2a2,I9f1fc593 into rvc-dev am: cb437ade am: 91f46803 am: 40dc89c8 am: 7b293fbf Change-Id: I116a2374680890be89c17b715faafef239a7a701