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

Change-Id: I1dc2a1c18566d89a996020cfafc184da0ff1b65d