am 34780ee3: Merge change 2982 into donut

Merge commit '34780ee3b6e9958e87e0d192e156806e3f30940f'

* commit '34780ee3b6e9958e87e0d192e156806e3f30940f':
  fix build break by reincluding empty method calls