Some clean-up
Merge remote-tracking branch 'origin/cm-11.0' into cm-11.0