am 42ba5806: am 72499628: am 25bab830: Fix build

* commit '42ba5806c03753a39f85016265173819ac465745':
  Fix build