Merge cherrypicks of [6541047, 6541028, 6541180, 6540905] into pi-b4s4-release

Change-Id: I8e80f71d77501148d316fbc89ecedbbf057917b9