Merge "Changes to support new v4.12.3 headers."