am 121bb380: am b63921f1: Merge "Build fix."

* commit '121bb3808e9277dc326775f5865efa57f9a7c26a':
  Build fix.