Merge "Disable OEM hook." into pi-dev