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

* commit 'c99c41781c69d2cfef411c531cf879e84ca62a74':
  Check permissions on getDeviceId.