Support custom headers above and beyond User-Agent.

Change-Id: Ibe325a34062b646d81dc2f2a4ed569be514065a4