Bug 1016814 - [System] Update to use gaia-header