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

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