Merge cherrypicks of [6390979, 6391791, 6391811, 6391479, 6391617, 6391605, 6391606, 6391607, 6391608, 6391733, 6391618, 6391813, 6391911] into pi-b4s4-release

Change-Id: I0c3e2dd9d585e603756ab63884af42eee4c79b7d