Fix macOS build am: c3ccab73be am: 797cdee074
am: 449a8f67c2

Change-Id: Ib8df4bac382e204ff8ba9c52f26964626fd2111a