Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev