Merge cherrypicks of [6092006, 6091028, 6091474, 6091417, 6090064] into pi-b4s4-release

Change-Id: I63c6d48ffc12ca0a0201947d8e3f32eb1a92e01c