Merge "Add EMPTY_RECORD for getDeviceIdentity" into oc-dev