am 7c580cab: am b5f1e878: Fix build breakage.

* commit '7c580caba94ca3b917c887b9e8353809c7f320c7':
  Fix build breakage.