Merge "Merge "Swap default for disableTestApiChecks." am: 972f7adfbf am: f814dc9c05 am: fca52b7e36"