Merge "Updating the BUILD_ID to OC for oc-dev branch." into oc-dev
am: 6652dd9005  -s ours

Change-Id: Ia25dbed43ba1614276c57756d2c1858614648635