am edb4a8f9: Merge "Restore Null Device Id for PHONE_TYPE_NONE Devices." into honeycomb-mr2

* commit 'edb4a8f93fb0af0651a83667ea70893511cf4602':
  Restore Null Device Id for PHONE_TYPE_NONE Devices.