Merge "Cache package names after reboot" into nyc-mr1-dev