am 01c2b053: Merge "Fix mac build"

* commit '01c2b053aa74d9bd461a29e0c252f7a8ce3f115a':
  Fix mac build