Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f
am: a652b7161d

* commit 'a652b7161d3069ba9b5650f1caf741d2588de141':
  Check permissions on getDeviceId.