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

Change-Id: Ifaad4b0145c39af14d7622711a19dd72b062db8b