am c391d887: am 943f1c0c: (-s ours) am 7334b956: am 96c55282: am d8b9218c: am 9d0497bd: am 44da08ed: (-s ours) am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev

* commit 'c391d8871eb63afa0c505b54ddcc6910ef2f8844':
  DO NOT MERGE fix build