Sync with CM 10.2 upstream + resolved conflicts

(No changes but keep history)