Merge "Fix darwin build" am: 0b7dd9f40d am: fc0fb4f0e2
am: 593fb1db96

Change-Id: I6ad54ace81c4bf437522f2d3dcd583099c84e6a2