Merge "Add ID_LENGTH field for Empty type record" into oc-dev am: bb63b4a376
am: 0c7e85da54

Change-Id: Ieee8273e8a32b15e060be4ffd835f4a964c4b5ac