Sync with CM 10.2 upstream + resolved conflicts

Misc + One cherry pick from @temasek to disable CMUpdater, we're building customs so we don't need it (imho).