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

* commit '064eb2a7cc8b811671682018b82c2b63064971ef':
  Check permissions on getDeviceId.