Merge "Snap for 6095409 from 99974d079e267783cf43d601058969f0884ed294 to android10-tests-release" into android10-tests-release