am 9d0497bd: am 44da08ed: (-s ours) am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev

* commit '9d0497bd4d59cec06f110b159da44fd0c20ad7c5':
  DO NOT MERGE fix build