Merge "Hopefully fix more darwin build breakage." am: b8573e2082 am: 44cac0c1b2
am: 736cc816e7

Change-Id: I862da7447294b0a4cf2ada148324a3db42bcd847