Clean up MockPropertyLabelResolver

Change-Id: Ibad4935c6ebd4b726cf2d61bd2fc62e702d233a5