Merge "Snap for 7866935 from 99216eb268625f012ab2d3ca0f0fa3c5b13461cb to android10-tests-release" into android10-tests-release