Fix mac build am: 1e92789a62
am: 28eeb9acf3

Change-Id: I9e4eb5ca376c4e00b2aa0b8dff99bd79e6d4fb10