Merge "Snap for 5934577 from 2de95a59ab6042394c4f1bd0833212a793ec7393 to android10-tests-release" into android10-tests-release