Merge "Add OEM_PAID network capability"