Fix macOS build
am: b86fd88966

Change-Id: I54926a8e2ef870e47017589ed7d4fca55657d829