Merge "Fix windows and mac build"
am: 9276d7e941

Change-Id: Iaf167de42d4d907e59e01964bb9861d319515cb9