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

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