Merge "Snap for 6971658 from 61545c9d7637dfa645404afaf433a70b797d8892 to android11-tests-release" into android11-tests-release