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