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

Change-Id: I60a5655616dbfd864709bb361f1c8e07255cb0af