Merge "Fix darwin build break." am: 3ea374f54c am: dc51803f87
am: 15704c4536

Change-Id: I5b2f05e2dd39bd7c9acff01d44e887b760696296