This adds about 30 seconds to my local boot time. Fixes bug #1179730 Change-Id: I519bb9289236abd43f8eb784768dcab10e2e5754