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

Change-Id: I4d4601b15d862bea2e573706e5b10dfe5fb33151