Merge "Change mapping file name to reflect its platform version." into oc-dev