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

Change-Id: Ibac00cc3176d343f86c35d5760b9bd8c51cb9929