Merge "Fix mac build." am: 5da045dc1a am: 2cefddbce5
am: 79a353c071

Change-Id: I2c94f7d867fb5b9a844cc005353fc561a32ff589