Merge "Duplicate file(s) detection and failure." into rvc-dev am: 4af7ee3e am: 95ef06d9 am: 142e12ae Change-Id: I4df824d1a7a2b268b11baf2cde3c753de4016e0c