am 3e926e05: Merge "Update doc package to r2. do not merge." into jb-dev

* commit '3e926e05d35c62b8e51defcdae8f099ebe92d3ed':
  Update doc package to r2. do not merge.