Merge "Fix darwin build"
am: 8c0c1ba989

Change-Id: I8acb6a80f4ab5458f01fb6196203c4c664438934