am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '7a107b857e658ba11c0c1fd2325ac91a2c0569a2':
  Fix build