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

Change-Id: I5bed1e39bcf26e099a6bf621fc416a8209114428