Merge "Fix macOS build" am: b9b7f3f061
am: 710e8f4da4

Change-Id: Ib109ceca0597a8a04dde6b44f865a7704605583b