am 53cf55c6: Merge change 2349 into donut

Merge commit '53cf55c64f85c11c4da4c47edddb387a396bb8b6'

* commit '53cf55c64f85c11c4da4c47edddb387a396bb8b6':
  Change the media key algorithm to also ignore double quotes.