am dd5d1fdd: am b183c181: am 1cbf17f7: (-s ours) am ffa4115a: Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev

* commit 'dd5d1fdd07877ead5ed7edc9ed826730f441147d':
  Get filename from File faster [DO NOT MERGE]