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

* commit '6e41d59665261ff015d73ee5180fa85b009dd41e':
  New command line tool: "settings"