Merge "Minor fixes on URI permission methods."