Reconcile with CM

Change-Id: Ibd6c348a844ac780d47c270dfd4dab813e281137