Merge "Making new node id APIs return strings." into jb-mr2-dev