Merge "Merge "Duplicate file(s) detection and failure." into rvc-dev am: 4af7ee3e am: d716114e" into rvc-d1-dev-plus-aosp