Update with latest CM10.2 commits