Merge "Fix macOS build." am: 71feb7b321
am: dcbd2a1501

Change-Id: I544e40b7c09f1c0bfc4bebf986bcd7ea34330163