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

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