am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files

* commit 'a80542dbf4f193c59525b8749871bcdf4ae4283a':
  Enabled incrementals to patch + rename moved files