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

Change-Id: I1c78ac59d46a211e9a95f617da4a96eab6d990dc