Merge "Snap for 8873100 from 1cf1bda6c39cc871369bb1265c48fd4975dbe96a to android11-tests-release" into android11-tests-release