Merge remote-tracking branch 'upstream/master' into pr/ember/server #4

Job	Run time
Build Docker CHIP Build images - base	6m 6s
Build Docker CHIP Build images - base (-minimal)	29s
Build Docker CHIP Build images - stage 1 (-crosscompile)	2m 0s
Build Docker CHIP Build images - stage 2 (-ameba)	1m 49s
Build Docker CHIP Build images - stage 2 (-asr)	1m 1s
Build Docker CHIP Build images - stage 2 (-bouffalolab)	7m 24s
Build Docker CHIP Build images - stage 2 (-doxygen)	12s
Build Docker CHIP Build images - stage 2 (-efr32)	1m 48s
Build Docker CHIP Build images - stage 2 (-esp32)	2m 12s
Build Docker CHIP Build images - stage 2 (-infineon)	2m 0s
Build Docker CHIP Build images - stage 2 (-java)	53s
Build Docker CHIP Build images - stage 2 (-nxp)	6m 2s
Build Docker CHIP Build images - stage 2 (-nxp-zephyr)	2m 35s
Build Docker CHIP Build images - stage 2 (-nrf-platform)	3m 4s
Build Docker CHIP Build images - stage 2 (-telink)	4m 14s
Build Docker CHIP Build images - stage 2 (-ti)	1m 2s
Build Docker CHIP Build images - stage 2 (-tizen)	1m 57s
Build Docker CHIP Build images - stage 2 (-openiotsdk)	51s
Build Docker CHIP Build images - stage 3	0s
Build Docker CHIP Build images - vscode	0s
	45m 39s

Provide feedback