Merge "Changes to support new v4.12.3 headers." am: ab9e842013 am: 4e99fac316 am: 6488d4e87d
am: 145b13a2db

Change-Id: Ic640122b90fc726373e0bd1d79eb68f1a99dc3fa