Merge "Snap for 7835292 from 982916aef05683e769a950664040e58f3e319d13 to android11-tests-release" into android11-tests-release