am ba45dcf4: Merge "Fix build - test issues."

* commit 'ba45dcf4272cc52781a18ec99b925fcc2222dc8c':
  Fix build - test issues.