Merge "Snap for 6381431 from 4d8083450ae7d04e7398f864c9854fb42c76378b to android10-tests-release" into android10-tests-release