Merge "Fix AM.revokeUriPermissionFromOwner for prefix mode." into nyc-mr1-dev