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

Change-Id: I50076c6ee46fa3b97936848cefbf0125f3258321