Merge "regenerate .bp files" into oc-mr1-dev