Attempt to fix new class resource conflict

Change-Id: I5f86b0ec2a469bfb2d81d5ca26ba81c8f12bcfc3