Merge "Snap for 5971367 from dd948046ab83b692b6fddc21dd373baf264669bf to android10-tests-release" into android10-tests-release