Fix mac build. am: 631c662e75
am: f7d27392bd

Change-Id: I082f93bacff45149267d5d61f5c09fb3d963b74d