Merge "Fix mac build"
am: 058a64acf5

Change-Id: Ia689c74ddf1eddb303194b7816f4bfd0956425ca