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

Change-Id: Icc120e2d91a5ce1d02f735f4faeb529c3c93391b