Merge "Add EID to types 1.1" am: b6eef77923
am: f94e65d293

Change-Id: Ic0fa5e1b01bb5e193701964b02a2f3bbb458fc87