Merge "Enforce formatting of bp files on repo upload"