Merge "Snap for 7836650 from e2054d5865f7e9723807394cbdc62d15337e87b9 to android10-tests-release" into android10-tests-release