Use LegacyIdInterpreter in EntityId to get rid of duplication

Change-Id: I894496a761cf0a2b0f9bed269aee776b233e1136
Merge "Use LegacyIdInterpreter in EntityId to get rid of duplication"