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

* commit '50843b1708f7662f9be661001125d91e0ef544d7':
  Check permissions on getDeviceId.