am 51e2f92a: am ab822d88: am a99d26b7: am 843b12a8: am 6b26de17: am 5360af4a: Remove support for duplicate file entries.

* commit '51e2f92a86c769949df816944fbe460ff4871862':