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

Change-Id: Ic66116e0c77d34ae970db5b05d6e66dacb0c3482