merge: Fix merge conflict between cm-11.0 and stable/cm-11.0

Change-Id: Iea073c41a2b1a4c18c189bc67f0916f77f60b2d9