Merge "Add ID_LENGTH field for Empty type record" am: b1f0bb6f83 am: 0d9dfc4314 am: 269cb38bb9
am: 50b8697071

Change-Id: I9fea9b4a931d334af711fa8e102594fb24f350fa