am 4117fd09: Merge change 6641 into donut

Merge commit '4117fd09e619c039a2bf5eff1bdc98186329cb4d'

* commit '4117fd09e619c039a2bf5eff1bdc98186329cb4d':
  Unbreaking the build.