Merge "Snap for 8070672 from 7d4161d8e829987135e0aa256874f8d35e4cf446 to android12-tests-release" into android12-tests-release