am 91fe0012: Merge change 3807 into donut

Merge commit '91fe001269907b50f812056285540d19519dadea'

* commit '91fe001269907b50f812056285540d19519dadea':
  Remove an old backup file.