Merge "Fix macOS build"
am: b9b7f3f061

Change-Id: I6f6d24801ea090c3725378ff6572381cb09836c9