Merge "Correctly insert platformBuildVersionCode/Name"