am 0b6a436f: Merge "Fix build"

* commit '0b6a436f09f10e358c64ee977c8322b3a76fd977':
  Fix build