am d8d05d56: am 287fa408: am 31234d81: fix build

* commit 'd8d05d5602baae6a79ca6cc933f18dcd8a4dc745':
  fix build