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

Change-Id: I0e95328c9ad95f879e6ac64c5ff37fc763f84d6f