Merge branch 'cm-11.0' into stable/cm-11.0

Change-Id: Ib6b0671a32f82c7baac7b1d18049a95fd1476184