am b17fdf7b: am af3cd21b: Merge "New command line tool: "settings"" into jb-mr1-dev

* commit 'b17fdf7b512530647037a7805c175c36db1549d8':
  New command line tool: "settings"