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

Change-Id: Ib2d2d4a62874c95f940c4ed77b0576dac526db55