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

* commit '5a708879a8f3be84376bc6c444442d37d6585d13':
  Add the new 'settings' shell tool to the build