Merge "Snap for 8606072 from 0a5cc21c4224842623495ff86f4002ea37fe17d2 to android11-tests-release" into android11-tests-release