Merge "init: Disable 'on' for non-Vendor APEXes"