Merge "Snap for 9032763 from 44601d104a7851d056b7da1fc70642a8a423c77e to android13-tests-release" into android13-tests-release