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

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