Merge "Snap for 8711527 from f35813628dd82435e831800a652b3b54aad20282 to android10-tests-release" into android10-tests-release