Merge "Fix darwin build break."
am: ca5560cb7f

Change-Id: I58c62ac3c93122ffee0f01d90575188c151921f0