Fix two potential NPEs in DeviceInfo

Change-Id: Ic4b5b203af25cda9ae65b477c92c1fb5f31ab093
2 files changed