Fix Mac build.

Change-Id: Iae697ae257cf4b1d675e2b758dd31d5a6a71ae4d
Merge "Fix Mac build."