am ed6e0b92: Merge change 2522 into donut

Merge commit 'ed6e0b92dd8a42a67d0ffd5cb62d69a65dfcd051'

* commit 'ed6e0b92dd8a42a67d0ffd5cb62d69a65dfcd051':
  This function should be public