Merge "Fix darwin build break."
am: 3ea374f54c

Change-Id: I5de5658169c27aaa753ffa40e13e3e3bf7b31e03