Merge "Fix mac build (hopefully)"
am: fb9c672577

Change-Id: Iaf9c9f43b785ed70851daf6b9ab89130efe5a9cd