Merge "Snap for 5932576 from 2f2d8ca38169ccc86aeafd6674df04d502cf356a to android10-tests-release" into android10-tests-release