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

Change-Id: I057fe0767eb8dc50c42d3fa8ca720948c46055a0