Remove EID field. Bug: 260540995 Test: local Change-Id: I0da91b6e0f21d11aa9ba1660e759b532eb7b7c35
ba69fd0d3f
d5ab7dc729