Merge "Update doc package to r2. do not merge." into jb-dev