Merge changes from topic "presubmit-am-ffc9771d6fac4e3d913d1894862288e2" into tm-dev

* changes:
  [automerge] Don't catch IllegalArgumentException from picker db query 2p: 56c82e18b8
  Don't catch IllegalArgumentException from picker db query