Temporary fix for duplicate resource

Change-Id: I8d9e87d756222d5174b87aa813f729c07a80de0a
Merge "Temporary fix for duplicate resource"