am eec57b37: Merge "Add support for the ternary operator to the header scrubber."

* commit 'eec57b370642f1b83285883104f2e778f32eef73':
  Add support for the ternary operator to the header scrubber.