Merge "fix(brcm): fix misspelled header inclusion guard" into integration