Merge "bootstat: reduce overall boot time" am: e42278d114
am: c19c573b74

Change-Id: Ia6e4983fd6cdc4fc77ae492b436b5c707ed72997