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

Change-Id: I09b8dc8a9dd72adc1789e1d6239cbdb1902a711f