Merge "Fix darwin build" am: 0b7dd9f40d
am: fc0fb4f0e2

Change-Id: I58f8b1303bc385cefabc2544fa7b8fd7fe4c9639