Sync with CM 10.2 upstream + resolved conflicts

Misc.