am f445a685: am 0b18c149: am 0f50cb31: Merge "Fix build."

* commit 'f445a6856777cdcbec14342c2a3510b26ea7b675':
  Fix build.