Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Change-Id: I7e3f5fa263c4bc78e198a71758402b661a019807