Merge "Ensure that android.test tests pass"