Merge "Fix Darwin build."
am: fef56f13bb

Change-Id: I9b688db4e00645ac22f366297a3f99fbd68ab7cd