am fb35b7c4: am 9e2ed7b0: am 7f2e05e9: Merge "Fix incorrect exception handling in perfboot.py"

* commit 'fb35b7c463321eab207f8c445efb9ff0e303f6ed':
  Fix incorrect exception handling in perfboot.py