Fixup a merge

Change-Id: I04dfd09c1878d98f11efa135fe1f1d991b60ab23
Merge remote-tracking branch 'origin/cm-11.0' into cm-11.0