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

Change-Id: Id4b490cbfc28f011a47304b0ad7f1ce754b92d89