am bc260206: Merge "Fix build."

* commit 'bc2602068d83b0226a614ed143cebd708c5fabd2':
  Fix build.