Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE