Merge "Fix checkbuild on Mac builders." am: 843c749626 am: 710acac922
am: 2a50bd92e6

Change-Id: I86fec1eb1afa89d6ac44df7debfc7778bec12a9d