Merge "Fix bootchart"
am: 76b420f38d

Change-Id: Ibdddbae1b4005ab7a0ed86cbcec88dc594189835