am 2aeaf234: Merge changes Id27ba241,I781fbe36 into jb-dev

am 2aeaf234: Merge changes Id27ba241,I781fbe36 into jb-dev

* commit '2aeaf2345ea0b72322ee301cb4412fa737b594bc':
  For JB, the READ_EXTERNAL_STORAGE permission is not enforced by default.  It may be enforced by default in future releases. Developers have the option of enabling enforcement to test their application and some may begin to include this permission on applications.  To avoid user confusion, the permission is placed in the development tools group.
  Update long strings to provide users with more information about permissions.