Merge "Fix User Level READ_EXTERNAL_STORAGE Permission"