am 2952fe9a: am 5503f6b8: am 7c88c340: am 3cee4c3a: fix build

* commit '2952fe9a644748a7dadfba91f0b1fc54737c39c1':
  fix build