am 96bc6841: am bc260206: Merge "Fix build."

* commit '96bc6841240d09050ef336461b9a13792f8080ed':
  Fix build.