Merge "Duplicate file(s) detection and failure." into rvc-dev am: 4af7ee3edc

Change-Id: Iea4236808dc9963ec84886ac9003660ae959cacd