Merge cherrypicks of [6117971, 6117954, 6117972, 6112663, 6112664, 6118388, 6119070, 6111429, 6114218] into pi-b4s4-release

Change-Id: I836b2d3232038060dc1169c63f96f5e43f71d0a7