Merge "Fix infinite loop during package-usage.list file upgrade" into nyc-dev