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

Change-Id: I41da6e5eaaf4a698b06bed8fb707c9e6287ff93d