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