Remove getNumericId altogether from EntityId

Change-Id: I45700901031d7cf85d61f089f171ee41549ebae6
Optimized imports

Change-Id: I31e94a96c042de102b828fb5e34cadf19def513c