am 8d9f0118: am fdd8551f: Merge "Fix build"

* commit '8d9f0118926d54b5a5fc1508a7c43aa661839f1f':
  Fix build