Hygiene: Address template FIXME, introduce overlay header partial

Change-Id: I4a78200100c58fcda049155776944d1a60b994d9
Merge "Hygiene: Address template FIXME, introduce overlay header partial"