Merge "Merge android12-tests-dev into android13-tests-dev" into android13-tests-dev