am 96e0f60: Merge change 1369 into donut

Merge commit '96e0f600a6a52aa1424c1e8787fc40c1b3b3f79a'

* commit '96e0f600a6a52aa1424c1e8787fc40c1b3b3f79a':
  Updated a comment.