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

Change-Id: Ia362d2b2529a502ed90d8273c5b1b44141f91073