am 42a6c754: am 3a38c110: Merge "Fix mac build"

* commit '42a6c75463a3b4590dbc9a3483222f3478342367':
  Fix mac build