Reconcile with CM

Change-Id: Ifa8d60f31e94213dc7f24ee735e2877fdd1efbb0