Merge "Remove RPC due to unnecessary permission check" into main