Add 3.x headers

Change-Id: Ie082bd078ad9f73ebae7d37985d072c679bb3e9a