Merge "Snap for 6931314 from 9ef57feced679356284a3a309424ecdc036c25fa to android11-tests-release" into android11-tests-release