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

Change-Id: I9bc7d569ae8f9d68fd30c9c0a20760b24adff246