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

Change-Id: I7c1ee59b3eda16790b3441654766ebe08f01406e