am cca053a3: am 3722947f: Merge "Doc update: manual merge of changes from jb-mr1.1" into jb-mr2-dev

* commit 'cca053a389bf913f23796e1095db9e1ae74bf2f0':
  Doc update: manual merge of changes from jb-mr1.1