Merge "Maybe fix mac build" am: a90d80c
am: bd58a38

* commit 'bd58a384da3d6957ec3f97bd6d16d320e9638795':
  Maybe fix mac build

Change-Id: I4d3c1a772157003f5667775efaea3eae190b6770