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

Change-Id: I7c2316e103f3610fbb0f7233f108f4a0b6891045