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

Change-Id: I8022164ff92612acb6caf492b405e5925c647da5