Merge "Changes to support new v4.12.3 headers."
am: ab9e842013

Change-Id: I9db34d9168c6b69b73cdfb3f8a62134850346a63