am 138ca8b8: Make unit tests pass again after OS callout change.

* commit '138ca8b8b121c17ff3ee9a7c10d76246a5c7325b':
  Make unit tests pass again after OS callout change.