Merge "Fix bootchart" am: 76b420f38d am: 193edfc72d
am: 1087a1f8cb

Change-Id: Ia1ca7df669741f71396d2fbc86f534fce664296f