am 253f8362: am fff0b4a6: Fix build.

Merge commit '253f836277ccaaae16342ff4379ca59746216536'

* commit '253f836277ccaaae16342ff4379ca59746216536':
  Fix build.