Merge "No need to check package name" into nyc-mr1-dev