Merge "Remove ~1/3 of the installd calls at boot." am: 5bc305b97c am: d948865e27 am: e36f449c90
am: bdf62c82c8

Change-Id: Iae00facaf7131c24e0480e909d7386b8ad64e6d1