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

* commit '8d702000a7291068e639a9954e03c36d66144449':
  Change getDeviceId to take phoneId.