Merge "Improve init bootcharting."
am: 4ee7861ee1

Change-Id: I1ac594b6e0325f4006fa1ca60ee75af8849a5901