am f2b82f52: Merge "merge in old CLs to new jd files" into jb-mr1.1-docs

* commit 'f2b82f5297a016a00be91b6b11afbef108985819':
  merge in old CLs to new jd files