Merge "Add OEM_PAID capability to system api" into pi-dev