Merge "Remove macOS-specific workaround." am: e5be747906 am: 6f92a637bd
am: 04eb0f1801

Change-Id: I3c8b3592074d76fdfd6ca08d62c4796547711691