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

Change-Id: Id33b75e657d56d1a7f0bc49f633e455460f79045