Merge "Update boot image and system server profiles [M10C10P10S0PP]"