Merge "Doc change: API diffs for 16." into jb-dev