Merge "Add pre-upload check to enforce correct formatting of .bp files"