Merge "Add EID to types 1.1"
am: b6eef77923

Change-Id: I7150952f6bf672c819a3430cd1b30f8c5f819b6d