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

Change-Id: I3ebfa88f34b0864519c41b2f3afec3282f3891aa