Merge "Update boot image and system server profiles"