Merge "Duplicate file(s) detection and failure." into rvc-dev am: 4af7ee3edc am: 95ef06d901 am: 142e12ae34 am: 8961397bf4

Change-Id: I08f5c62ffcfaa82e8bc706b173efaf0c89c314b3