Probably Mac build fix? am: af241a5c8c am: 3a1d885864
am: 1c5a871624

Change-Id: Ieff93dcda142ddb701eac7cf85d6f003ab6cb21c