Merge "Update BP strings" into udc-d1-dev