Minor updates from CM-OnePlus source