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

Change-Id: Idde4f089a7657c8269539744bf63f5ab6abc9402