am 568b62c8: Merge change 4702 into donut

Merge commit '568b62c861ed4abc792d517f61640610400614e1'

* commit '568b62c861ed4abc792d517f61640610400614e1':
  Fix bug 1927213 test failures.