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

Change-Id: Id9abd1e042aa31a3267301f53d0d6a328f082df2