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

Change-Id: I5027f40f9d13186a8670712b9f44105b3329ee5f