am b9fdad77: am ec81b4a3: Merge "Scrub uapi headers slightly harder."

* commit 'b9fdad7715f3b3182e0fd6947446ef8df82064e8':
  Scrub uapi headers slightly harder.