am 9552329f: am 93e060e1: (-s ours) am 9e2ed7b0: am 7f2e05e9: Merge "Fix incorrect exception handling in perfboot.py"

* commit '9552329f1e81f365836ce0fed2a99c6225b2c736':