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

Change-Id: I3fe4288b883f6bc7799a74de5b1d2529a824eee8