Merge "Fix darwin build" am: 8c0c1ba989
am: e68fa81351

Change-Id: Ia9d754f5a71ba2a6d926139e3eb1b1082b1ef1cb