Reconcile with cm-11.0

Change-Id: I677260d44635b0f3b7e41cbe4ab614ded8a90a4e