Merge "Update boot image and system server profiles [M82C37P58S0PP]" into main