Reconcile with CM

Change-Id: Idb4640d080ad28f5980c5cd5074efe444d92580a