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