Merge "Fix darwin build break." am: ca5560cb7f
am: 6d108dd5f9

Change-Id: Iaa34803c80a17b2dd379c39aa978fc4b3c40d426