Merge "Hopefully fix more darwin build breakage."
am: b8573e2082

Change-Id: I96d92e896b2921a317c54332ec9a9253156984d4