am 02fd5a43: Merge "Handle exceptions other than CommandException" into lmp-mr1-dev automerge: 75ce5b6

* commit '02fd5a430be5b3ab005f9a1b0d0518df55c4f66e':
  Handle exceptions other than CommandException