Resource: Fix merge error

Change-Id: I634491412b179b571ff5988405239c0d60ac0c47