Merge "Fix darwin build"
am: 0b7dd9f40d

Change-Id: I59ca894ee3a671e281bb015571797b9e5d1d9c24