Merge "Add product property for preopting extracted APKs"