Merge "Fix API review bugs." into jb-mr1-dev