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

* commit '7334b956547b4ea780f759931770be411ecdad88':
  DO NOT MERGE fix build