am b812b74b: am 78133f53: Merge "Fix build"

* commit 'b812b74be9961d6bcdc6d0eacff3831fbf452378':
  Fix build