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