Merge "Fix name shadowing bug with revoking URI permissions." into gingerbread