Merge "Snap for 7963748 from b72317bc4713d635ab392e7a6093c7694711110a to android11-tests-release" into android11-tests-release