Merge "Update external storage permission strings." into klp-dev