am 4ec6e1e5: Merge "Expand scope of try/catch" into ics-mr0

* commit '4ec6e1e521951a3b3d521a20122ba7100dbd6cc8':
  Expand scope of try/catch