Merge "Delaying populating APEX cache until boot is completed."