Merge "Fix mac build."
am: 51b4f48280

Change-Id: Ibd1f92670c0238f094616125be0080c8d5c0a50b