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