am 0743f28b: am fd671b2d: Merge "Add the new \'settings\' shell tool to the build" into jb-mr1-dev

* commit '0743f28b0f2813ce9c93812cb212319d70734064':
  Add the new 'settings' shell tool to the build