Merge "Snap for 8994135 from 8fb0e5196c35365e351b4f0986efe5e3d04dcfa5 to android10-tests-release" into android10-tests-release