Merge "Add product property for preopting extracted APKs" into oc-mr1-dev