Fix OS X build

Change-Id: I9437bee64b318754ee5dc595f35be865a21d6a11