Merge "Snap for 7105167 from 63624550b1c6f3f70d5e0f3cd4995d402c6b9394 to android11-tests-release" into android11-tests-release