Merge "Fix apex package retrieval on boot"