Merge "Add EMPTY_RECORD for getDeviceIdentity am: 40d93997b5  -s ours am: 245ea97cf8  -s ours" into oc-mr1-dev