am bd8242a3: am 02dab3f6: Merge "Small fixes in tools." into jb-mr2-dev

* commit 'bd8242a38e41f5711a22a36f330543ee241b2bd8':
  Small fixes in tools.