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

Change-Id: Ib3ee26caed921ddd4c6d1498bdc0d1df6bd5c819