Merge "Fix mac build"
am: fbf7dd9f86

Change-Id: I1c658fcadaa003dee5e14df9f9240cda04f078ed