Reconcile with CM

Change-Id: I34e94bb9f4cf930c28c895665dec05437491f2da