Merge cherrypicks of [5678594, 5678595, 5678596, 5675496, 5675497, 5678860, 5678897, 5665877, 5665878, 5678939, 5678940, 5678941, 5678942, 5678943, 5678944, 5678945, 5675449, 5678034, 5678597] into pi-b4s4-release

Change-Id: I6626562a7bbe8c752da4d03f0ba7cdc8bf0cd9ce