Merge "Support multiple Enrollment APKs" into nyc-dev