Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc
am: 5d7bb383b8

* commit '5d7bb383b85aeaa60abeb6e3ad7ba854d6c40b37':
  Check permissions on getDeviceId.