Merge "Snap for 7903125 from 88aec4d93228d8b6c790b24229d8769a4c2cc423 to android11-tests-release" into android11-tests-release