Merge "Fix typos in preinstalled-packages-platform.xml"