Merge "Improve init bootcharting."