Merge "Improve init bootcharting." am: 4ee7861ee1 am: a6532b4717 am: 1a947725b8
am: 352b9c6282

Change-Id: I58b258cbf13bdcc874bcce35d4bb07378a8a1864