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

Change-Id: If9aeb600fc09e04072b5dec1e1b1531ba95440a0