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

Change-Id: I8ed2ad58a7915b607fb9bc960a9f0f0e1e048e52