Merge "New attempt at fixing mac build."
am: 620021e643

* commit '620021e643518dc93dc618d3e9df1c33ff8a491c':
  New attempt at fixing mac build.