Merge "Snap for 6933425 from ad91c8b0b69ff57078c6b0b14d66bd6f14eb0cf6 to android11-tests-release" into android11-tests-release