speed up boot time

Change-Id: Ide7ec1e2a74d323b1d23f5fd9628b239cc933ef0