Merge changes Ib293173b,I9244baf7 into rvc-dev am: 05331bc94b am: 93e313811c am: 44c91a0f4c

Change-Id: I3172589dfc1143d7c1236fd135dbc18371d60720