am 6062815: Merge change 859 into donut

Merge commit '6062815e2e5db38ad90d580782bd733e23d027f2'

* commit '6062815e2e5db38ad90d580782bd733e23d027f2':
  Change 77 from git master branch: