Fix mismerge

Change-Id: If04ed479b243e444b5ff4ef1250c6e2a60d9aea1
Merge remote-tracking branch 'upstream/cm-11.0' into HEAD