Merge "Fixing incorrect resource overlay naming."