Merge changes I7d2ca2a2,I9f1fc593 into rvc-dev am: cb437ade00

Change-Id: I61a5a454d030352b615ffe26529cc325722e109a