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

Change-Id: Idd564a7d8779290419eca44e959dbb535d3c0e31