am a2694c99: Merge change 7166 into donut

Merge commit 'a2694c998c85a438c7d3fefd79bbeb751d594134'

* commit 'a2694c998c85a438c7d3fefd79bbeb751d594134':
  Fix a few date format strings to put backslashes in front of apostrophes.