Fix macOS build am: c3ccab73be
am: 8fb5ed9dfb

Change-Id: If2225ede8691d1a272b4718d63babf9aec1ef636