Merge branch 'master' into LoadBalancingSafeChanges #3457

Job	Run time
build (ubuntu-latest, 29, armeabi-v7a, ON)	5m 2s
build (ubuntu-latest, 29, arm64-v8a, ON)	6m 32s
build (ubuntu-latest, latest, armeabi-v7a, ON)	5m 16s
build (ubuntu-latest, latest, arm64-v8a, ON)	5m 12s
	22m 2s

Provide feedback