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

* commit '3f88ff6b537fb53806f126b4aea3355686387717':
  Fix method not found errors for unit test.