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

Change-Id: I05a2180f8f8123f1f222d9642260df2fd76e33a8