Merge "Fix macOS build."
am: 49529dd513

Change-Id: I2d5929947753795593088f3e18f20dc6c071e1a0