Reconcile with CM

Change-Id: I69f8fa392542da794ae8baee336b6e65be06740a