Merge "Snap for 5886434 from 2fbe5d67b4bb1195b7876c4753fe9bf21e14c6e1 to android10-tests-release" into android10-tests-release