Merge "Change getDeviceId to take phoneId." into lmp-mr1-dev
automerge: f4e5236

* commit 'f4e52360613d20dc8176ce8a37cb05ad904fad0d':
  Change getDeviceId to take phoneId.