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

Change-Id: I3122bfca491ffffd7b0f0f17aba7561126f60bb3