Merge "Enforce consistent formatting of .bp files" am: 6c3596d66b
am: 6da8fe398b

Change-Id: Ida48fd62c88573a2ece333d9f9def9aff8372ef9