Merge "Add EMPTY_RECORD for getDeviceIdentity" into oc-dev
am: 345a396c18

Change-Id: I1188659709dfa1bf475375a4fbbcb6258d5d991c