am a79ee8e2: Merge change 5792 into donut

Merge commit 'a79ee8e2d3b4ae3e74ccefa5eeec215b425d9a8e'

* commit 'a79ee8e2d3b4ae3e74ccefa5eeec215b425d9a8e':
  Fix typo introduced during variable cleanup.