Merge "Fix Darwin build." am: fef56f13bb
am: bcf24c21e7

Change-Id: I29381a9fe18cb0e874236cd8c426b34b1767e2bd