Sync with CM 11.0