Header adjustments to match BMS apps

Issue: GCP-9531
Reviewer: Dan V.