bring in line with android_vendor_pa