clean-up, update
Merge remote-tracking branch 'upstream/cm10.1' into cm10.1