Fix macOS build am: c3ccab73be
am: 797cdee074

Change-Id: Iea48585f6e0ba8de0bdff2f811b7e1557eb9f7c3