This should make your clean-up easier

Change-Id: I51c490279dba5ad8479200abeffbf416833955d7
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0