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

Change-Id: Ib2d2d4a62874c95f940c4ed77b0576dac526db55
Revert "Merge remote-tracking branch 'cm/cm-11.0' into du44"

This reverts commit 5d54101544f25fb438331c8ebcc005c51ffacf51.
Merge remote-tracking branch 'cm/cm-11.0' into du44

Change-Id: Ib2d2d4a62874c95f940c4ed77b0576dac526db55