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

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