Merge "Fix method not found errors for unit test." into jb-mr2-dev