Remove $entityId and $parser from PropertyParserFunction constructor params

Change-Id: Ibeaa953c73f95376c6f5c46f1998c0bb9c95726b
Merge "Remove $entityId and $parser from PropertyParserFunction constructor params"