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

Change-Id: I923cb6ed3b459f092a24211f7e18076d248ae615