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

* commit 'd8b9218c4e8449fb1d87750ced7ab26a28019627':
  DO NOT MERGE fix build