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

Change-Id: Idb0cab9d39d6e0f661b1a1c7b891b6d57fedb69b